Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 15:15:38 +0000 (08:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 15:15:38 +0000 (08:15 -0700)
commit14a1a9e5a4c87826012a3792a9d866ea5fe58cc7
treead8fee988ae8c9888790684187098fc91c790d6d
parent8fe59cc834df54aafac1bd2a904107e6def37b29
parentd4a5be06db1154094523a6cf2e2cb983ab922158
Merge from trunk